[IA64] Clean up unused functions

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: Anthony Xu <anthony.xu@intel.com>

diff --git a/xen/arch/ia64/vmx/vmx_phy_mode.c b/xen/arch/ia64/vmx/vmx_phy_mode.c
index 52825720e0cb3faa588db7ebfd93471f46d9e1d5..372619dd5064e01063d8a51536b02188093b690d 100644 (file)
--- a/xen/arch/ia64/vmx/vmx_phy_mode.c
+++ b/xen/arch/ia64/vmx/vmx_phy_mode.c
@@ -204,23 +204,7 @@ vmx_load_all_rr(VCPU *vcpu)
        ia64_srlz_i();
 }
 
-void
-vmx_load_rr7_and_pta(VCPU *vcpu)
-{
-       unsigned long psr;
-
-       local_irq_save(psr);
-
-       vmx_switch_rr7(vrrtomrr(vcpu,VMX(vcpu, vrr[VRN7])),
-                       (void *)vcpu->domain->shared_info,
-                       (void *)vcpu->arch.privregs,
-                       (void *)vcpu->arch.vhpt.hash, pal_vaddr );
-       ia64_set_pta(vcpu->arch.arch_vmx.mpta);
 
-       ia64_srlz_d();
-       local_irq_restore(psr);
-       ia64_srlz_i();
-}
 
 void
 switch_to_physical_rid(VCPU *vcpu)

diff --git a/xen/arch/ia64/xen/regionreg.c b/xen/arch/ia64/xen/regionreg.c
index cebed96efc9030938606adfee185090085609561..58c89201fbe6739ca886025239703802bfe42294 100644 (file)
--- a/xen/arch/ia64/xen/regionreg.c
+++ b/xen/arch/ia64/xen/regionreg.c
@@ -342,22 +342,3 @@ void load_region_regs(struct vcpu *v)
                panic_domain(0,"load_region_regs: can't set! bad=%lx\n",bad);
        }
 }
-
-void load_region_reg7_and_pta(struct vcpu *v)
-{
-       unsigned long rr7, pta;
-
-       if (!is_idle_domain(v->domain)) {  
-               ia64_set_pta(VHPT_ADDR | (1 << 8) | (VHPT_SIZE_LOG2 << 2) |
-                            VHPT_ENABLED);
-
-               // TODO: These probably should be validated
-               rr7 =  VCPU(v,rrs[7]);
-               if (!set_one_rr(0xe000000000000000L, rr7))
-                       panic_domain(0, "%s: can't set!\n", __func__);
-       }
-       else {
-               pta = ia64_get_pta();
-               ia64_set_pta(pta & ~VHPT_ENABLED);
-       }
-}

diff --git a/xen/include/asm-ia64/regionreg.h b/xen/include/asm-ia64/regionreg.h
index 7b9baecd9e0f280ebba5907a51470d80efdac347..c2e9ecc68266bc5401ea89a997b42f0dcb337261 100644 (file)
--- a/xen/include/asm-ia64/regionreg.h
+++ b/xen/include/asm-ia64/regionreg.h
@@ -79,6 +79,5 @@ extern void init_all_rr(struct vcpu *v);
 extern int set_metaphysical_rr0(void);
 
 extern void load_region_regs(struct vcpu *v);
-extern void load_region_reg7_and_pta(struct vcpu *v);
 
 #endif         /* !_REGIONREG_H_ */

diff --git a/xen/include/asm-ia64/vmx_phy_mode.h b/xen/include/asm-ia64/vmx_phy_mode.h
index c480d11dfcea27713ec19df8f12c9d810261369f..02f8cc643fa34a035fe5fc1ece577914f3bb52f2 100644 (file)
--- a/xen/include/asm-ia64/vmx_phy_mode.h
+++ b/xen/include/asm-ia64/vmx_phy_mode.h
@@ -96,7 +96,6 @@ extern void prepare_if_physical_mode(VCPU *vcpu);
 extern void recover_if_physical_mode(VCPU *vcpu);
 extern void vmx_init_all_rr(VCPU *vcpu);
 extern void vmx_load_all_rr(VCPU *vcpu);
-extern void vmx_load_rr7_and_pta(VCPU *vcpu);
 extern void physical_tlb_miss(VCPU *vcpu, u64 vadr);
 /*
  * No sanity check here, since all psr changes have been